From: kaf24@firebug.cl.cam.ac.uk Date: Wed, 13 Sep 2006 13:34:34 +0000 (+0100) Subject: Fix unmodified drivers for PV-on-HVM on IA64. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15658^2~53^2~6 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=60ddf8d64dee3224377e34e70927eff1fc593ef5;p=xen.git Fix unmodified drivers for PV-on-HVM on IA64. Signed-off-by: Tsunehisa Doi Signed-off-by: Tomonari Horikoshi --- diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index 382a493796..76e228cbe9 100644 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -42,6 +42,12 @@ i[34567]86) ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm ;; +"ia64") + ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm + ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm + ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm + ln -sf ${XL}/include/asm-ia64/maddr.h include/asm + ;; *) echo unknown architecture $uname exit 1 diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index 6527b18e80..2bb4dbd5b4 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -117,6 +117,7 @@ unsigned long alloc_xen_mmio(unsigned long len) return addr; } +#ifndef __ia64__ /* Lifted from hvmloader.c */ static int get_hypercall_stubs(void) { @@ -162,6 +163,9 @@ static int get_hypercall_stubs(void) return 0; } +#else /* __ia64__ */ +#define get_hypercall_stubs() (0) +#endif static int __devinit platform_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -207,7 +211,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev, if (ret < 0) goto out; - if ((ret = init_xen_info())) goto out;